restored non-bulk testing