Remove ElementFactory imports
Make unit tests compile, updates still needed