New test with internal refactor, WIP