Working on code coverage and completing unit tests