Adds more tests to improve coverage