Fixed some variable names and formatting in main test file