Upgrading project to use XCTest
Fixing compiler warnings in unit tests
Fixing compiler warning about unused variable
Minor performance optimization