First list tests
Moved some code around, fixed dependencies.