refactor expand_test > expand to make nose happy