Skip some tests if some deps are N/A
variable refactoring
Small fixes