Improved CTX test