moved tests to Expect framework + fix test that broke due to random map iteration