adjust the frontend controller and add additional tests