Added badge support (and tests)