API, CS keys, timeout, unit tests