Revert "Updated tests and thrown messages"

This reverts commit 04bb0ad06ad6b568af0407b13b0a9e8ffab67b03.