Move personal to controller and add tests for it

But then again core doesn't seem to matter what you use. So probably a non-issue.