Added helper, test fixed