Continue refactoring and add some tests