rpearce: Split up tests, cleanup
rpearce: Improve test coverage, include bi-directional slaving