move tests, fix modules