1. More fixes for smoke and component tests
2. Removed test_data.cfg file
3. Fixes to marvin libraries