Fixed tests crashers