Fixed tests, cleaned up unused exception