Complete product builder unit test before refactoring