Cleaning
Fixes export lists etc
Cleaning
Moves tests
Tests