Added locators, crud fns & tests for hw-models