Updated readme again & fixed tests