Import lists
Tests cleanup