Merge "refactor: trim down extensive test list"