More fixes on test