Refactor and additional tests