3505 fixing chapter controller and adding tests
3505 better tests