Add further tests and a minor fix w.r.t. note