Fixes for 1.0 tests