beefin' up.  lots of tests