Updated the not found exception
Improved the exception tests