petrihakkinen Tweaked tests.