Update tests to reflect change in return value
Take a pass at updating the README