More tests, removed dependency on gem