[AESH-88]
tests + fixes