Adding MADSScheme class, removing unused fixtures