Unit testing corrections.