tests reorganized to use new testing lib