fix couple of tests