Add time and server to index.
Fix unit testing.