Fix complement implementation. More tests