Add controller advice, update jackson, add some more tests