Fixed broken tests and removed unwanted gem dependency.

Fixed broken tests and removed unwanted gem dependency.