Will update the readme and tests