Cleaning up exception methods and added some tests