Minor fixes in Experiment related classes and tests.