fixed naming and references; added simple model + basics for test database; TODO: setup test data