Refactor all basic tests to use expect, tighten some up a bit