Reverting to non-test