Updated DemoNonDetChoiceTest (and QEA). The test looks like it is
passing :)
Fixed UseFileOther and added skip states and some checks in builder.
Added a test, updated builder.
Added another test. Did guard stuff.