make sure that @import statements have the correct format  +  adjustments to the test_app
Merge remote-tracking branch 'upstream/master'