fixed an issue with lazy lists
improved test coverage
improved test coverage for images