Merged chair and user controllers tests + fixes