More serious go at getting squish tests running again.