Added missing files from unit testing and image (crappy VS!)