Cleaned up the test directory a bit.
Updated the basic test.