Add more tests to bring code coverage up to 71.7%