Removed unused test files, version bump, cleaner groups