Fixed blackbox tests - removed some