Add utility swift files and modify test class names