Update purist tests, move window out of a specific version
Clean up purist tests