Removed locator from test. Also filled out shortened variable names.