Updates for new return type and addition of test files.