Work on #15, tests and refactor of tasks to account for schema changes