Silence unused variable warnings
Fixed test

Also, removed 2 redundant test executables and updated the run
script appropriately.