Fixed failing tests

- Still many tests to write