Add coverage and improved test perf