100% coverage and fixed tests