added Imports, changed package, updated tests