fixed several test cases
UnexpectedError14 fix
Merge branch 'PlugNPlayFixes' into PlugNPlay