Started unit tests, bug fixes & small changes.