New structure to JUnit integration test to simplify Test files