Fixed tests so they pass