ADEN-1237 Test stuff