Fixed bug, still failing add/remove test though.