Added builder classes that build test objects, and changed tests accordingly.