Added modified tests