WIP helper & integration tests