Added Convert to Paint Location. Started Tests