Added EBTest and TBTest.  Still working on UABTest.
Final changes added