Fixed tests and reduced coverage percentage