Fixed tests

and depending stuff