Condition Module - adding/refactor unit tests

Adding/Refactor unit tests