Working on ValueObjectTest, clean up in PageTest