Updated version snapshot and extracted tests to separate test class.