Removing flash, also adding to the user test suite