[#2] Complete test coverage