Compability fix
Fixed stories to meet new reality
Update timeout for testing