Refactor tests for Constructor weaving