Full test compliance, including many minor fixes and swappables