Fixed tests to correct for issues