Changing everything back for now, until I find a better way of testing.