Fixing tests. They all pass now.