Testing and Interface Change

Cleanup the tests and start to better flush out the grid and obstacle
options.