renamed package
fixed tests