MadLib changes and import testing