Fixed some tests and reverted void->bool in removeAddress