Better comment test
Make base configurable again