Bug fixes/improvements to tests & flash messages so that they don't break