CLN: Make Exceptions more specific
TST: Cleanup test_frame some more