Added some tests and made the flash ERb look a little better