update tests to be more single expectation like.