Change packages, added simple test