Several tests passed. Added 'add' and 'remove' functions