Refactoring and some empty tests