Some minor testing clean up
Feature complete