Rearrange Image.h and add some testes filesbej