tweaks around filter order, is_test visibility