test builder + some fixes