Tests! coverage up

--43.9% coverage by my count