Refactored for LDC tests