Improve flash notices and tests