Fixed Test Imports

There were some problems resolving the method-names, so
just added pub to the function and updated the using statement
in the test (per the new structure) and all seems to be working
now. Stil need to write some real tests... but progress is being
made.