Add tests for working grid setup
Clean up Solver class