Added system Image types test and fixes