Added deterministic tests for generators and better error handling to WH