remove should, use expect, fix type