Fixed a couple of issues when using non-standard experiment configurations
Fixed some tests, added a new one