Integration test refactor

Some simple refactoring done to use Objects instead of traits for a helper trait which was also divided into two objects