Move nested class in to full class, move tests.  Move only, code not changed