Improve test coverage

Currently fails because of #111