Removed Unnecessary Exceptions, Finalized unit tests