Refactored test setup to work as intended, and implemented test setup verification unit test