Moving tests
Finishing migration of tests