Added additional name filter. Causes some test not to run.