Changed package name to CapitalCase
added several unittests