Fixed tests, added test for removeids