Unified returnValues, added more tests