More fixes/tests