rimage wimage + more tests