ENH: flesh out the test suite and add in raises so that python -O works with this code

remove option setup code for failing tests

remove unnecessary complexity

remove unnecessary complexity