Completed 9 unit tests, fixes issue #2, fixes issue #3