JH: added sample data, improved map position test, fixed mysql -> map bugs