more refactoring of junit tests, slow tests go to integration test module
more refactoring of junit tests, slow tests go to integration test module