Refactored: minor changes to definition arrangements and tests