Modified test data generation
Merge branch 'dev' of github.com:Chandler/flesh into dev
Hide OZ zombie status