Test improvement + added close test