Organize Tests + update Package_Validate()