Correcting unit tests and code.