Running tests again, fixed SA testing.