refactored test package for same naming as main package