Completed Task 1 functionality, added unittests