add test / split controllers