Updated gems. Fixed tests based on new gems.