Fixedup tests