Moved the model layer's datasource bean to the filtered resource
directory
Had the test classes use the test context file.  Corrected services
context file name in the test context file.