More improvements in the test/mock form, use _controller, better errors.