Refactor
Finished exception tests