[general-refactoring] More tests