missing throw added, and test class names renamed