Tests fixes + move test images out of source