move tests from separate dir