added testdate, minor changes