isolated methods added to other system package to a separate package, fix a test