updated/added test classes