additional tests and doco