cleaned up inheritance model
integration test cleanup for particle generation