More unit tests

Change-Id: I9652c34e8f89b5c308ac676e6ad2365fcea843e2
Merge remote-tracking branch 'origin/bobmel/csr1kv_for_routing_icehouse' into bobmel/csr1kv_for_routing_icehouse