Improve db test data and remove functional test one line