Fix bug in bc variables.
Adjusted test that now use bc var programs.
Miscellaneous test cleanups.