munit test classes and improvements