Test fixes & a few comments