simplified tests and updated flash use