Re-factor default test cases