Updated readme and tests