Finish API Test Suite except some bugs and new features needed