Added clone method, added tests