merging circle and icon tests

Thanks Jari.