Remade some tests. All tests are green, now.