Improve tests folder organization