Fix up tests & readme