merged both tests