refactored test cases ... pulled gsaves out