Update to 2.0.0 and adding test
Everything