Completed task with Tests

Hooray!