Added sources variables
Moved tests to test/
Cleaned up test imports