Initial testing suite support