modified topological order to favor generators inclduing their dependencies (fix #32)

add corresponding unit test, update other tests to not rely on mock instance identify anymore

@tfoote @wjwwood Please review.