use 'subtypes' of ExperimentType
Merge branch 'master' of github.com:gxa/atlas
fixed test
Merge branch 'master' of github.com:gxa/atlas