Moving away from Cloud9 Test