TST + BF: More testing, more fixes.