issue #12: work on non-default tests