Moved around some tests.
Moved api_tools to a lower level