Finish build badge config options test (again)
Remove workaround for NPE bug in 1.500