Added locators, crud fns & tests for hw-models

s/make_hw_models/make_hw_model?