Fixed up the test, renamed a few packages.