Added tests for the Temporal handler + corrections