Package refactoring
Adding additional tests
Test fix