Refactoring LIM creation: 3 tests fail