Adding tests (fails, needs a closer look)