More fixes on testing