package rename
removed deprecation warnings
package appropriation in tests
groovy script changed in locii of above changes