I've changed the test to more succinctly test what I've described above. Also makes the diff a bit smaller