made test setup and assertions more explicit

DRY is of no use here