made some more tests and fixed remove modifier funcitonality