More tests; coverage back to 100% for core.