Issue #147 - Correct tests for Issue #184 and Issue #185