Revamped test structure to align to other problems. Fixed error in bft3.