Update tests organisation