Fix some broken requires, add condition builder with some tests, more needed