A bit more unit tests