Small code changes for unit tests purposes.
Unused "use" lines removed.