Badge updates and tests on 5.6