Cleaned up existing specs
Cleaned up used gems and specs