Fix .CGI
Get a test to be a bit more reliable