0.2.2: Fixing tests