Added exceptions, tests not working correctly.