Added new test coverage, up to 74%