New test + code cleaning