r35: Really added unit tests :(