Updated GridTest