Fix for add scenario to empty database, updated fixtures for FAT, other minor updates.