Refactored tests to reflect that they are a part of the package.