Fixed API, Images and Testing