Renamed Packege + added simple tests