Completed most of the generic tests