Start working on more thorough code coverage