Unit tests have been improved. Some variables are now being initialized.