Moved tests and added test for readDate