Restored Nick's test to previous state.