adding badges, adding more tests and fixing a problems identified by those tests