Numerous bug fixes. Work continues on monitor test.

Change-Id: Ibca0ec4d608f1987c566e456dcc948b710ba3f41
Signed-off-by: Scott Mann <smann@noironetworks.com>