modified tests for new return style.