All tests running in one run

Some refactoring done to ensure a smooth run