Add removeuser and removeuser3 calls, including test cases