Updating the Makefiles to have tests in own directory

Reorganizing Makefile to remove deps

Summary: Fixes T8

Test Plan: allow travis to test

Maniphest Tasks: T8

Differential Revision: http://code.peteftw.com/D8