Add a master solution and test for individual APIs