Applies unit testing bug fixes