More fixes and tests