Updated code to mimick the improvements made in the v1.3.0, updated tests and bumped version