Added some tests for advanced tutorial
Renamed files and some cleaning