Buck testfix2

@ArnaudBrousseau  Please check this out and think about how to fix them a different way.