Added test using rapture (waaaaaaay simpler)
Presentation final touches