finish first draft of complete API testing - note some hacks in place at this time