Fix for including hamcrest jar in the test file build command line; cleaned up some debugging lines;