Test Modifications & structure change

Moved images to view folder, modified some test method names to be more
descriptive