Some refactorings.
Creating a tests that catchs rodrigovilar/LOM-kernel#1