Fix bop controller and update test.