Separate the Persona class from the test code

Split the test code from the class implementation