fixed all green tests