Fix for '#define' indent; tweak tests