Updated with first test