Re: require maintainer defined for each test & clean up current tests