Scrub through tests, updating to use latest assert and expect macros.