Refactored tests to conform to package namespace.
Compiling at last.