Adding a few test files + some cosmetic changes here and there...