Added tests and fixed inaccurate 'decl-node' classifications when calling 'decl-report'