Fixing tests and adding details