Added textures, updated test