Refactored 18 and simplified testing.