Working on new testing suite