Bug fixes.
Removed mcfproj from test directory.