Fixed remove bug in IBS and added more white box tests