More assertions and simplified callback transformers in tests.