Fix/tests