added timestamp, added tests