code refactoring of Van tests