Refactoring LIM creation: 2 tests fail
Refactoring LIM creation: 3 tests fail