Nonfunctional changes except

* Not creating test2 when compiled