moving to tests instead of Test