Fix failing tests and turn module level testing back ony