Finalized unit tests
Merge remote-tracking branch 'origin/Selenium' into integrationTests