DO NOT MERGE - temp disable tests