Tests working for 0.9 release