Fixed more tests based on API feedback