added a few more features, fixed tests

- renamed an exception to make it more clear