some fixes for tests and namedtuple as default