Clean up more test cases and add ones for the setup command