Refactored tests and added docking station functionality
Refactoring code and bug fixing after IRB tests