Image loading is mostly working
Added test
Update