few non-critical changes in tests to make them execute successfully