Also add $timestamp parsing and unittest for other usecases