Test skip_trackable
Fix filter order
Fix tests