Better test, some new files