Converted test to XCTest
Merged unit tests into a single test target