Some progress on broken test