Fixed tests to use return value