[#35] A few more unit tests