Fix image tags
Added initial tests
Test update
Getting there...