Added missing files and disabled tests