Working on test code coverage and fixing