Use -covermode=count when calling go test
Better coverage and cleanups