Basic test cases should come first
Remove unused code