Add tests to FIXME