Better handling of the special test address case!