added remove + test