[test] move simple tests to server directory
[fix] don't double resolve and return consistent objects