More fixes, more junit