Removed all reference to substrate, moved tests to XCTest