Fixed Grid tests and others completed..