UPDATED: naming tests partially validated