Clean up, new tests, switch to server repository (from local)