Preparation--shouldn't conflict anything
Changed fields to fName and lName by Calvins direction and added new tests.