Refactored dockable tests