test(*): refactor and test