Add extra tests, some will fail