fixed tests + added tests for conditionals