Refactored code and test
Added docking station and tests