Adds to-be-fixed tests