Cleaned up the test - reduce duplication