remove spurious semicolons from C macros
fix test after changing internal method calling (test finally behaves as expected)