corrected non-short circuit cond translation
refactored test framework so that test projects can be extended
check