8 Test cases and counting.
Move more test cases to CT.
Introduce up to test case 20
Add more test cases.