Bugfix: making tests more flexible by matching instead of testing for equality.