avoid warnings
updating test files, minor tweaks to handle special cases