fix mulitplechoice (and barchart) unit tests to match recent changes