some changes to tests.  Added more labeled data for Steven.