More unit tests and dic strings. Got rid of some small bugs that came with recent introduction of eq_in etc.