cleaning tests and adding after() filter