minor bug fixes and skipping Grizzly tests until GeneralTest is fixed