Started writing tests, disabling South for now