LumX, refactorings and tests reinstated...