Rename some variables, add function to create test data.
Comment out call to createData() (test data creation)