Revert "Reverted to a very basic test"

This reverts commit decf577ff9f914828eb4fe4ae35b5f533eac6999.