More framework stuff + test program changes