Move strikeout test to an appropriate place