Updating last nights work
Added helper tests