Tests pass, need more tests to push coverage up