Updated remaining tests to function-returning variants