cleaned factories classes, removed unused code and ugly tests