Added new test, and updated test files
IDE changes too