polishing assertions texts
adding tests
minor fixes