Bounds2 refactoring, adding mutable methods + test suite