Added v0.2.1 and fixed tests