Fixed nits & gated XCTest test case