More tests cleanup