Remove redundant test/handler roots