Further fixes to cassettes and timecop tests