[#3] Implement tests reflecting the futre structure of the API