Make timestamp param position consistent. Add some tests