Split tests and test more cases