More test fixing to get it working