Updated for first test