Added better headers and timecop to test them