Refactored tests and grid methods