Make filter work with Google's filter for instrumentation test and clean up our filter