Added Flag and Object classes, tests for self-localization