Cleanup & get SDM experiment tests working