Merge "Split properties into their own class to make testing better"