completed remaning tests

plus moving tests around