Updated unit tests for faulty arch
Merge branch 'master' into wip