review bits from julien - + more tests