improve functional test
improve overview