Tests: add more cases