Fixes #61 - Order by timestamps with tests