Some last minute clean up stuff
Adds a few bad arg test cases