Updated

Minor tweaks to test samples. Renamed API with Test embedded into the
class names.