[#35] More unit tests