SCRUM-1684 - some attributes need definitions irregardless of their inclusion in object templates, other minor fixes to get tests running