Code to fix #633
Modified the test outputs