Increase test coverage and get test to run