#1168 Return logic for obsolete properties, fix tests, fix PageModel