Unnecessary reference
Moving stuff around
Updating tests to use the new API