PR-II

- Add mocks for records and tags
Should be name for both. Decided to rename for consistency but missed #2