Added Unit tests for new location/method functions