remove junk
More working tests, solve StrictDynamicMappingException, cf_last_resolved is causing test failure