Some fixes, and disable tests for now