remove test controller. update regex and move some code around in seshat