File & Testing Updates

To main.cpp