Started JUnit tests.
Merge remote-tracking branch 'choose_remote_name/master'
More JUnit
Merge remote-tracking branch 'choose_remote_name/master'