Simin Chen added tests