Little tests cleanup