Defer more tests