Update for test, now null is returned instead of empty string