Rewrote tests to use a more appropriate datastructure (or combination thereof).