Changed exception type
Removed double test case
Skipped tests needing a refactoring
Commented tests producing fatal errors