Continued moving tests into defaultMain