fixed tests.  fixed bodacious inflate for 2
added xml layouts.  need2 relayout