Got rid of empty.yaml
Renamed test helper classes

* Removed the Person class and used Simple (formerly Z) instead