Added some tests
Updated classes to have a package