Fixed location model import.
Added some missing selfs to unit tests.
Got rid of some superfluous protected member access in favor of properties.