More Unit testing. Reorganization of code and made some properties names consistent (lowercase beginning).