Created test units and fixed getCurrentRemainingCr