Fix single org tests to use chef org