Fixing unit-test structure