Navigation System tests, bug fixes on Battery class and Vacuum Class, Automation in some classes to use automatic tests
Conflicts resolution
Merge bug fix