Clean up for spike changes

Some clean up and re-factoring of the behave tests.