Made changes to some functions in Api model to match specifications.
Hopefully this will fix my testing problems.