fixing bugs in tests; cleaner strategy, after hooks ...