Fixed throws and exception issues with tests and classes