Move bval dependency to test scope