removing timestamp test, it's not really necessary in this case