Add tst and fix an error