Jbau wallawalla

@sefk 

Added special case for WallaWalla suffix and also a test