Added data controller and client side tests