Units test are broken, but I am cleaning them up to the quality of the other code.