WYOCL: Improved tests