Merge "added tests to api_suite and error_handling_suite"