separate Tests functional
optimize tests