Added Ryan's changes to APIWrapper Test