Added tests, incremented versions properly