Removed duplicated test
Added functional tests for skip conditions and uncovered a bunch of bugs in the conditions code and unit tests