1)Removed orphaned file, 2)Renamed original calculator tests
Actually added the file from last commit. Its getting late ...