FIX: make selftest more robust