Feature/en 1831

Looks like the unit tests need more work.