Revert "added own exception and more test"

This reverts commit 44a48d1c6be3b69e7b8c414a70cd1de598a6d961.