Better default test, removing common defer function