Working on v1.1.0 and test