Removed own usage of ShouldBeOfType
Update gems