Replaces "should" with "Expect" statements
Added other parameters to connection class to refine query to API
Merge branch 'feature/add_extra_API_queries' into develop