Extracted test system to a separate file.
Fixed name of package.