Tests are working. Need to remove timestamp hack.