Further unit test consolidation