Added code for final tests.  Started working on real app.