Fix story tests and related issues with model structure