Added functions to return multiple, initial tests pass
Fixed error