Refactored test, to use new new return structure