(fix) Reclaim vertical space in DispatcherSpec; Fix tests; Appropriate return type declarations in Manager - #631