Fixing assumed dependency issue; address minor build issue with tests in that the package name and file location were not in sync