Fixing redefining TIMBER_LOC constant
added test, tightened syntax
Merge branch 'alexsomeoddpilot-master'

* alexsomeoddpilot-master:
  added test, tightened syntax
  Fixing redefining TIMBER_LOC constant