Add test cases
Remove Main class