Update readme and clean up tests