Update themed Deal page code to use one theme
small fix, Test for entertain template added
Deal test fixed using timecop