moved tests a bit