Fix tests

- Fix tests