Clenaup tests