More tests

The reason of this branch was completely different, but... heh