Fixed errors, deleted test