Ruby 2.0 Support
Tests cleanup