rewrite tests for integer coordinates
macro-tool passes new tests