add fixes for tests, add timestamp type