cleaning up, fixing of some tests, exteded some builders