Little tests cleanup.