clean up test cases, add location types
function work on erroneous branch
Merge branch 'feature/save-locations' into develop
add some functions
all functions initially defined, problems with the spec on a few
Merge branch 'feature/finish-function-list' into develop