Misc tests
Cleaning
Cleaning
Basic export list fix