Added more SafeTests