Moved the live test to test and made it better