STEM-3 #comment fix test infrasturcture to make test passed
STEM-2 #comment merge from lucasallan/stem.git + fixes