Refactor tests to line up with existing example in external