Get tests passing and add badges!