Use timeout and add more tests