- BestLocationDelegate uses LocationCriteria. Added test (it's a bit messy though, sorry\!)
- Fix NPE.