Updated readme and fixed tests