fixed tests && added client-side test