Expand tests and add badges