Revamped test structure to align to other code examples.