clean list a bit
refactor test include order