Fixed tests so they all pass