Update tests, add more cases