Merge "libtimeinstate: add more tests"