Updated tests to match latest design changes, now passing.