Renamed all test files and modifed code to address comments