fix marker bbox calculation - closes #1849
iwyu
tests for 1849
add more expected test files