Make test expectations more fine grained