Add tests for catching argument errors.
Improve readability.
More thorough testing and excluding contains.