TestAssembly refactoring