Changed unit test structure