Fixing tests. Working on presentation.