big clean up. Removed crufty sample examples and firmed up
testing around things we care about
oops... not quite ready to delete this