Fixed tests so they are all passing