Minor Changes
Minor Fix
move Main and Test in test package
Minor Fixes