Added two functions to websites
Merge
Added tests for date / no date