added an option to get better line numbers with mundane matchers
fixed the failing tests