Unskip the skipped tests

[elvijs]

We currently skip two tests as they weren't essential, but seemed tricky to fix. We should probably either delete them or make them pass.