Add test, add database service