Fix broken test due to additional timer. Add additional test