Updated unit test structure