Revert "with-testikayttaja-makro"

This reverts commit e88614b04edee595b4cd4a590c9fa210b321cfef.
with-testikayttaja-makro