Removed most of the archiving intermediate buildsteps; was causing issues with CATCH + gcc-4.9
Added conditional CATCH #include
Added some basic test fixtures