more work on bonus stuff, one old test broken