Refactor flash block and add tests for after user save