Added back test controller for edgecases.