Added tests+removing in progress