Additional tests cleanup