Cosmetic changes and some testing improvements (default image loading).