Got func tests working!
Added id keys to the location and activity to dict methods
Making more tests