Tests enhancement