Tests review

I prefer to let tests fail instead of commenting them out, makes it more visible what's missing.