#11: added location logic
#11: fixed Location related tests
#11: removed Schedule concept