Minor updates + unit test refactoring