Cleanup tests

Cleanup in existing tests. Especially in the `fixme` category.