WIP: cleaning up and simplifying the test