Make definition.* properties on the definition function
Refactor definition tests to reflect new definition structure