Fix: bunch of tests that look at details instead of behavior