- fixup TEST_DEPENDS
- use VARBASE where needed