Update and fix switch tests. flow_table.py also needed to be updated.

nx_switch isn't quite working yet, but software_switch.py appears to be good
to go.