fixed wish service test (initial)
removed unused test
test for user service (initial)
Merge remote-tracking branch 'origin/fix-test'