Writing more tests to improve coverage