Starting refactor for test code.
Merge remote-tracking branch 'origin/iOSunit_testing' into iOSunit_testing
Refactoring and code commit of test that is currently not 00% working.
Minor commit.
Merge remote-tracking branch 'origin/iOSunit_testing' into iOSunit_testing