refactor(test): code cleanups