Test.swift conflicts resolved
got rid of switch commenting