Fixed errors found during the first test