Working on 7QBW tests