added white/black tags and fixed up some testing style