Use short class names
Use newinstance with closures instead of string with code
Use assertInstanceOf() instead of deprecated assertClass()
Fix test - __construct was spelled with three leading underscores