Changes so we could identify positive and negative test cases
refactor