[#3] More unit tests