Added in additional JUnit sections and rearragned make file for better order.
Should be cleanups for Tuts from here on out.