FIX: Now really passing all tests (including callbacks)