grapes fixed and tests refactored to work

All tests are running and passing in CI after long state of failing.