Remove TEST2.
Merge branch 'master' into NS