Fix load btn and added test package
Merge remote-tracking branch 'origin/eli'