Updated gemspec
Sorting out test structure
Bumping version