Improved 'test', now supports else