Merge "Revert "Revert "Adding unit tests for exception classes"""