Tests: add more testcases