Add tests which cover additional functionality