Fixed tests so that they now pass