Removed an unneccessary switch enum, added more detailed exception handling, removed a deprecated test class