TST: add some tests and comments to previous fixes