Slight refactoring of weaving unit tests.
#123: tests pass
#123: hell yea.