Completed conversion of phantomjssmith tests