[MAT-84] add fudge to classpath
[MAT-84] Add missing imports