Test coverage tweaks

Conflicts:

	tests/config.js
Test coverage tweaks