Added expected value checking to unit tests