The final code clean up for test cases and variable names according to Paul's suggestions